From bacdb193839f5b65ba407de53e23dccaa24fec59 Mon Sep 17 00:00:00 2001 From: oliskoli Date: Wed, 19 Apr 2006 22:54:58 +0000 Subject: [PATCH] Fix conversion specification (valgrind). --- html.c | 4 ++-- text.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/html.c b/html.c index b1021844f..dd725ffac 100644 --- a/html.c +++ b/html.c @@ -66,7 +66,7 @@ html_disp(const waypoint *wpt) int latint, lonint; char tbuf[1024]; time_t tm = wpt->creation_time; - int32 utmz; + gbint32 utmz; double utme, utmn; char utmzc; fs_xml *fs_gpx = NULL; @@ -83,7 +83,7 @@ html_disp(const waypoint *wpt) fprintf(file_out, "
\n"); fprintf(file_out, "
\n", wpt->shortname); - fprintf(file_out, "

%s - %c%d°%06.3f %c%d°%06.3f (%ld%c %6.0f %7.0f)", + fprintf(file_out, "

%s - %c%d°%06.3f %c%d°%06.3f (%d%c %6.0f %7.0f)", (global_opts.synthesize_shortnames) ? mkshort_from_wpt(mkshort_handle, wpt) : wpt->shortname, wpt->latitude < 0 ? 'S' : 'N', latint, 60.0 * (fabs(wpt->latitude) - latint), wpt->longitude < 0 ? 'W' : 'E', lonint, 60.0 * (fabs(wpt->longitude) - lonint), diff --git a/text.c b/text.c index 70297d514..d1a405e2a 100644 --- a/text.c +++ b/text.c @@ -67,7 +67,7 @@ text_disp(const waypoint *wpt) int latint, lonint; char tbuf[1024]; time_t tm = wpt->creation_time; - int32 utmz; + gbint32 utmz; double utme, utmn; char utmzc; fs_xml *fs_gpx; @@ -82,7 +82,7 @@ text_disp(const waypoint *wpt) tm = time(NULL); strftime(tbuf, sizeof(tbuf), "%d-%b-%Y", localtime(&tm)); - fprintf(file_out, "%-16s %c%d %06.3f %c%d %06.3f (%ld%c %6.0f %7.0f)", + fprintf(file_out, "%-16s %c%d %06.3f %c%d %06.3f (%d%c %6.0f %7.0f)", (global_opts.synthesize_shortnames) ? mkshort_from_wpt(mkshort_handle, wpt) : wpt->shortname, wpt->latitude < 0 ? 'S' : 'N', abs(latint), 60.0 * (fabs(wpt->latitude) - latint), wpt->longitude < 0 ? 'W' : 'E', abs(lonint), 60.0 * (fabs(wpt->longitude) - lonint), -- 2.30.2